<html>
<head><meta charset="utf-8"><title>How to update past the rustfmt integration · t-compiler/help · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/index.html">t-compiler/help</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/How.20to.20update.20past.20the.20rustfmt.20integration.html">How to update past the rustfmt integration</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="241481795"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/How%20to%20update%20past%20the%20rustfmt%20integration/near/241481795" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Thom Chiovoloni <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/How.20to.20update.20past.20the.20rustfmt.20integration.html#241481795">(Jun 04 2021 at 01:38)</a>:</h4>
<p>I don't contribute to rustc often, but had something I wanted to do. When git pulling, this happens</p>
<div class="codehilite"><pre><span></span><code>~/src/rust $ git pull
Updating 8a8ed078832..cc77ba46fcb
error: The following untracked working tree files would be overwritten by merge:
&lt;... bunch of files with rustfmt in the path&gt;
Aborting
</code></pre></div>
<p>I think this has something to do with integrating rustfmt in the tree, but don't really know how to fix it.</p>



<a name="241481920"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/How%20to%20update%20past%20the%20rustfmt%20integration/near/241481920" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Thom Chiovoloni <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/How.20to.20update.20past.20the.20rustfmt.20integration.html#241481920">(Jun 04 2021 at 01:40)</a>:</h4>
<p>for clarity, git status reports:</p>
<div class="codehilite"><pre><span></span><code>On branch master
Your branch is behind &#39;origin/master&#39; by 6496 commits, and can be fast-forwarded.
  (use &quot;git pull&quot; to update your local branch)

nothing to commit, working tree clean
</code></pre></div>



<a name="241481958"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/How%20to%20update%20past%20the%20rustfmt%20integration/near/241481958" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Thom Chiovoloni <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/How.20to.20update.20past.20the.20rustfmt.20integration.html#241481958">(Jun 04 2021 at 01:41)</a>:</h4>
<p>oh, weird, okay, </p>
<div class="codehilite"><pre><span></span><code>$ rm -rf src/tools/rustfmt
$ git pull
</code></pre></div>
<p>worked. I had assumed <code>git pull</code> would be upset about the dirty tree. </p>
<p>So, nevermind!</p>



<a name="241482072"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/How%20to%20update%20past%20the%20rustfmt%20integration/near/241482072" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Chris Denton <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/How.20to.20update.20past.20the.20rustfmt.20integration.html#241482072">(Jun 04 2021 at 01:43)</a>:</h4>
<p>See also: <a href="#narrow/stream/131828-t-compiler/topic/rustfmt.20in.20tree">https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/rustfmt.20in.20tree</a></p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>